from trunk
authorKenichi Handa <handa@m17n.org>
Thu, 14 Jan 2010 12:06:23 +0000 (21:06 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 14 Jan 2010 12:06:23 +0000 (21:06 +0900)

Trivial merge